Tweak the 32-bit windows triple

diff --git a/.travis.install.deps.sh b/.travis.install.deps.sh
index 6f3cc5ce9a724ac3540493e3ad82dede20be8868..5e9acbe0a1a6f6ceab49c9ffdc758f3d7e7ffb2a 100755 (executable)
--- a/.travis.install.deps.sh
+++ b/.travis.install.deps.sh
@@ -60,7 +60,7 @@ else
     #
     # When cargo has a 64-bit nightly of its own, we'll only need to download
     # the relevant windows nightly.
-    v32=i686-pc-mingw32
+    v32=i686-w64-mingw32
     v64=x86_64-w64-mingw32
     curl -O http://$host/dist/rust-nightly-$v32.exe
     curl -O http://$host/dist/rust-nightly-$v64.exe

diff --git a/configure b/configure
index bb0085b99b6408b3dee1a83834d2fdc09e997104..e1da3a7f574aaca1435dbb88af3abcee0a8b4dc2 100755 (executable)
--- a/configure
+++ b/configure
@@ -354,6 +354,12 @@ CFG_MANDIR=${CFG_MANDIR%/}
 CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
 CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
 
+# Temporary support for the old windows triples. Remove when rust also removes
+# this
+CFG_BUILD=`echo "${CFG_BUILD}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
+CFG_HOST=`echo "${CFG_HOST}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
+CFG_TARGET=`echo "${CFG_TARGET}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
+
 # copy host-triples to target-triples so that hosts are a subset of targets
 V_TEMP=""
 for i in $CFG_HOST $CFG_TARGET;